return silently if "gtk_initialized" is TRUE. Re-enables calling GTK's

2005-05-02  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkmain.c (do_post_parse_initialization): return silently if
	"gtk_initialized" is TRUE. Re-enables calling GTK's init functions
	multiple times when using gtk_get_option_group(), just as one can
	call gtk_init() multiple times without doing any harm.

diff --git a/ChangeLog b/ChangeLog
index d4e8e5f335e715a2e3d9cecaae2e318b61d5a977..fa1761344812d201ecbc399af8c1492a1aca0642 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-02  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkmain.c (do_post_parse_initialization): return silently if
+       "gtk_initialized" is TRUE. Re-enables calling GTK's init functions
+       multiple times when using gtk_get_option_group(), just as one can
+       call gtk_init() multiple times without doing any harm.
+
 2005-05-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): Propagate

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d4e8e5f335e715a2e3d9cecaae2e318b61d5a977..fa1761344812d201ecbc399af8c1492a1aca0642 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-05-02  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkmain.c (do_post_parse_initialization): return silently if
+       "gtk_initialized" is TRUE. Re-enables calling GTK's init functions
+       multiple times when using gtk_get_option_group(), just as one can
+       call gtk_init() multiple times without doing any harm.
+
 2005-05-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): Propagate

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d4e8e5f335e715a2e3d9cecaae2e318b61d5a977..fa1761344812d201ecbc399af8c1492a1aca0642 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2005-05-02  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkmain.c (do_post_parse_initialization): return silently if
+       "gtk_initialized" is TRUE. Re-enables calling GTK's init functions
+       multiple times when using gtk_get_option_group(), just as one can
+       call gtk_init() multiple times without doing any harm.
+
 2005-05-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_expose_event): Propagate

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 68785b446445780297702b3f18dc1b15547a32f8..1d53bf087b575cfd628dbd78f37086ea7a3028e8 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -452,6 +452,9 @@ static void
 do_post_parse_initialization (int    *argc,
                              char ***argv)
 {
+  if (gtk_initialized)
+    return;
+
   if (g_fatal_warnings)
     {
       GLogLevelFlags fatal_mask;